Merge commit '314d47749a79d0382eea1b710456b038a1ac84c0' into win64
authorAlex Crichton <alex@alexcrichton.com>
Thu, 11 Sep 2014 20:13:43 +0000 (13:13 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Thu, 11 Sep 2014 20:13:43 +0000 (13:13 -0700)

Trivial merge